moved gtkrc.bg to more generic gtkrc.cp1251

diff --git a/ChangeLog b/ChangeLog
index 47dbbee43ff1ecc35d6087fb6b911cd7e8f715eb..e4116608bd8df60724f59a354cf014ad7fd170e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 18 15:35:35 2000  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+       * gtk/gtkrc.cp1251,gtk/Makefile.am: the cp1251 is also used by
+       Byelorussian language; changed the Makefile and file names 
+       to reflect that.
+
 Mon Jun 12 16:58:40 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_unmap): Call gdk_window_withdraw

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 47dbbee43ff1ecc35d6087fb6b911cd7e8f715eb..e4116608bd8df60724f59a354cf014ad7fd170e8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Jun 18 15:35:35 2000  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+       * gtk/gtkrc.cp1251,gtk/Makefile.am: the cp1251 is also used by
+       Byelorussian language; changed the Makefile and file names 
+       to reflect that.
+
 Mon Jun 12 16:58:40 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_unmap): Call gdk_window_withdraw

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 47dbbee43ff1ecc35d6087fb6b911cd7e8f715eb..e4116608bd8df60724f59a354cf014ad7fd170e8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Jun 18 15:35:35 2000  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+       * gtk/gtkrc.cp1251,gtk/Makefile.am: the cp1251 is also used by
+       Byelorussian language; changed the Makefile and file names 
+       to reflect that.
+
 Mon Jun 12 16:58:40 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_unmap): Call gdk_window_withdraw

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 47dbbee43ff1ecc35d6087fb6b911cd7e8f715eb..e4116608bd8df60724f59a354cf014ad7fd170e8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Jun 18 15:35:35 2000  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+       * gtk/gtkrc.cp1251,gtk/Makefile.am: the cp1251 is also used by
+       Byelorussian language; changed the Makefile and file names 
+       to reflect that.
+
 Mon Jun 12 16:58:40 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_unmap): Call gdk_window_withdraw

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 47dbbee43ff1ecc35d6087fb6b911cd7e8f715eb..e4116608bd8df60724f59a354cf014ad7fd170e8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Jun 18 15:35:35 2000  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+       * gtk/gtkrc.cp1251,gtk/Makefile.am: the cp1251 is also used by
+       Byelorussian language; changed the Makefile and file names 
+       to reflect that.
+
 Mon Jun 12 16:58:40 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_unmap): Call gdk_window_withdraw

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 47dbbee43ff1ecc35d6087fb6b911cd7e8f715eb..e4116608bd8df60724f59a354cf014ad7fd170e8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Jun 18 15:35:35 2000  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+       * gtk/gtkrc.cp1251,gtk/Makefile.am: the cp1251 is also used by
+       Byelorussian language; changed the Makefile and file names 
+       to reflect that.
+
 Mon Jun 12 16:58:40 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_unmap): Call gdk_window_withdraw

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 47dbbee43ff1ecc35d6087fb6b911cd7e8f715eb..e4116608bd8df60724f59a354cf014ad7fd170e8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Jun 18 15:35:35 2000  Pablo Saratxaga <pablo@mandrakesoft.com>
+
+       * gtk/gtkrc.cp1251,gtk/Makefile.am: the cp1251 is also used by
+       Byelorussian language; changed the Makefile and file names 
+       to reflect that.
+
 Mon Jun 12 16:58:40 2000  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkwindow.c (gtk_window_unmap): Call gdk_window_withdraw

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index d5fb16300ad37cc23516d792df87fcce22c9e438..d51febd130501f3dc917a2e95441d4ae13c217c7 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -471,12 +471,13 @@ $(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources
 
 
 gtkconfdir = $(sysconfdir)/gtk
-gtkconf_DATA = gtkrc.bg gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
+gtkconf_DATA = gtkrc.el gtkrc.eo gtkrc.he gtkrc.hy gtkrc.ja \
        gtkrc.ko gtkrc.ru gtkrc.tr gtkrc.th gtkrc.uk gtkrc.iso-8859-2 \
        gtkrc.iso-8859-5 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
        gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.Big5 \
        gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
-       gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii
+       gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii \
+       gtkrc.cp1251
 
 # We create a dummy theme for the default GTK+ theme
 install-data-local:
@@ -485,16 +486,17 @@ install-data-local:
            $(DESTDIR)$(datadir)/themes/Default/gtk/gtkrc
        $(mkinstalldirs) $(DESTDIR)$(gtkconfdir)
        cd $(DESTDIR)$(gtkconfdir) && \
-         for i in cs hr hu pl ro sk sl sq ; do \
+         for i in cs hr hu pl ro sk sl sq sr ; do \
            rm -f gtkrc.$$i ; \
            ln -s gtkrc.iso-8859-2 gtkrc.$$i ; \
          done ; \
-         for i in bg_BG.iso88595 mk sr ru_RU.iso88595 ; do \
+         for i in bg_BG.iso88595 mk sp ru_RU.iso88595 ; do \
            rm -f gtkrc.$$i ; \
            ln -s gtkrc.iso-8859-5 gtkrc.$$i ; \
          done ; \
        rm -f gtkrc.lt gtkrc.lv gtkrc.cy gtkrc.ga gtkrc.et gtkrc.ka \
-            gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi ; \
+            gtkrc.vi_VN.viscii111 gtkrc.vi_VN.tcvn5712 gtkrc.vi \
+            gtkrc.be gtkrc.bg ; \ 
        ln -s gtkrc.iso-8859-13 gtkrc.lt ; \
        ln -s gtkrc.iso-8859-13 gtkrc.lv ; \
        ln -s gtkrc.iso-8859-14 gtkrc.cy ; \
@@ -503,7 +505,9 @@ install-data-local:
        ln -s gtkrc.ka_GE.georgianacademy gtkrc.ka ; \
        ln -s gtkrc.vi_VN.viscii gtkrc.vi_VN.viscii111 ; \
        ln -s gtkrc.vi_VN.tcvn gtkrc.vi_VN.tcvn5712 ; \
-       ln -s gtkrc.vi_VN.tcvn5712 gtkrc.vi 
+       ln -s gtkrc.vi_VN.tcvn5712 gtkrc.vi ; \
+       ln -s gtkrc.cp1251 gtkrc.be ; \
+       ln -s gtkrc.cp1251 gtkrc.bg 
 
 uninstall-local:
        rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc

diff --git a/gtk/gtkrc.bg b/gtk/gtkrc.bg
deleted file mode 100644 (file)
index d0fc357..0000000
--- a/gtk/gtkrc.bg
+++ /dev/null
@@ -1,8 +0,0 @@
-style "gtk-default-bg" {
-       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-                 -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-                 -*-helvetica-medium-r-normal--12-*-*-*-*-*-microsoft-cp1251,\
-                 -*-arial-medium-r-normal--12-*-*-*-*-*-microsoft-cp1251"
-}
-class "GtkWidget" style "gtk-default-bg"
-

diff --git a/gtk/gtkrc.cp1251 b/gtk/gtkrc.cp1251
new file mode 100644 (file)
index 0000000..d0fc357
--- /dev/null
+++ b/gtk/gtkrc.cp1251
@@ -0,0 +1,8 @@
+style "gtk-default-bg" {
+       fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
+                 -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
+                 -*-helvetica-medium-r-normal--12-*-*-*-*-*-microsoft-cp1251,\
+                 -*-arial-medium-r-normal--12-*-*-*-*-*-microsoft-cp1251"
+}
+class "GtkWidget" style "gtk-default-bg"
+